From 6e4370372ed0900861ba8d832974c70a96490d44 Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Mon, 4 Apr 2011 22:46:39 -0500 Subject: [PATCH] fix-epg-digest-algorithm-alist.diff * The value for RIPEMD-160 in epg-digest-algorithm-alist has been fixed. Patch: fix-epg-digest-algorithm-alist.diff Provided-by: Daniel Kahn Gillmor Date: Thu, 26 Aug 2010 14:09:01 UTC Added-by: Rob Browning Status: incorporated upstream The Debian patch is taken from this upstream commit: revno: 102553 committer: Daiki Ueno branch nick: trunk timestamp: Fri 2010-12-03 10:52:43 +0900 message: Trivial fixes for epg.el. * epg.el (epg-digest-algorithm-alist): Replace "RMD160" with "RIPEMD160" (Bug#7490). Reported by Daniel Kahn Gillmor. (epg-context-set-passphrase-callback): Mention that the callback is not called when used with GnuPG 2.x. --- lisp/ChangeLog | 7 +++++++ lisp/epg.el | 10 ++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ebb21c4761e..f5b616d17ae 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2010-12-03 Daiki Ueno + + * epg.el (epg-digest-algorithm-alist): Replace "RMD160" with + "RIPEMD160" (Bug#7490). Reported by Daniel Kahn Gillmor. + (epg-context-set-passphrase-callback): Mention that the callback + is not called when used with GnuPG 2.x. + 2010-05-07 Chong Yidong * Version 23.2 released. diff --git a/lisp/epg.el b/lisp/epg.el index 9fde76d5f85..ad172dfbdcd 100644 --- a/lisp/epg.el +++ b/lisp/epg.el @@ -66,7 +66,7 @@ (defconst epg-digest-algorithm-alist '((1 . "MD5") (2 . "SHA1") - (3 . "RMD160") + (3 . "RIPEMD160") (8 . "SHA256") (9 . "SHA384") (10 . "SHA512") @@ -335,7 +335,13 @@ PASSPHRASE-CALLBACK is either a function, or a cons-cell whose car is a function and cdr is a callback data. The function gets three arguments: the context, the key-id in -question, and the callback data (if any)." +question, and the callback data (if any). + +The callback may not be called if you use GnuPG 2.x, which relies +on the external program called `gpg-agent' for passphrase query. +If you really want to intercept passphrase query, consider +installing GnuPG 1.x _along with_ GnuPG 2.x, which does passphrase +query by itself and Emacs can intercept them." (unless (eq (car-safe context) 'epg-context) (signal 'wrong-type-argument (list 'epg-context-p context))) (aset (cdr context) 7 (if (consp passphrase-callback) -- 2.30.2